From 051d14abf54e537d6934f8b87925d5e14376f110 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 24 Apr 2018 10:46:54 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 450757 -> 451485 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 4781d02af81..89370213450 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,7 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 019cd442c85997520d2cc2c1285e48816581cd4d..7af439f3e57b559202da8e739d69aa0e2b8b8b3a 100644
GIT binary patch
delta 574
zcmY*VOK1~O6y@d4OeTY|tutEFr1~<{Y9V7R>P88qS`gEPV$n?rVN9oOv?OR^L<Fge
z(2b>$nat6Jf`}VkSVielyC`nl*M*3?77^`I7lJRJ7W&}wKIhzX?mMe1(I=mxbMIKq
z*sXD~Ca&34d$N?zy2CH_VoYZ}!Ojc%yIJ4%<)zLJOBumM++Y#>)|s}2`38$^LuW9`
zSv+#NY)?C<ng-mmZWk&u)|P5sXM+b@*4ad&Jwg-Db@0?3r<|Ry8cbARxoXhcd%fJU
zxjEnz?W?m+t~7bw<na_QmSBHS4E!5XLio8zL&$lw2XiikkyuewY%WMae7qq^B)*4d
zj{`9*xO5yh>lDKmm-a*R<S_oabjV#&CI2Z&Fg=Rm$0Iq0U+bh{!lORiU8644*O-I@
zV@eoxk9v__rG0qs(J(fqCB2P)drqo*aquKwJrpA(8*~iauLEjJH{YOs9NlCpmM$q>
z{(WlOEjGx4{6LJ7{3EOQ+@KVAja1|s6x?-w{9I=A!r7E5BEg%lfe5~DkbEN44E0vA
z>{NJW<jRO(XrZY>D@n0Avt_4s-oe0tPe+m+dPmpfDc+PePxH!*Q`AB`I<%?6eA*{b
Mk|=pO?JKp+e^h6;w*UYD

delta 198
zcmXAizY76z0LA0oT_Qi?x}$TOjAF4Fm{1}s{{w%3bOYJQkGppUlYc?13@C}eK=}u3
zHYwjSeBSc<ytg_V$Ae*QJVSMq);t35F0EnRr&Uq{yiefcD=+)`U7*b86f%1@GSp{?
z^JI&t%@F0=Mv_(^65|dGRv%DVcaUPBC571NC_&C0=<LS4A?_XI7@4EOCXxMXW5VR;
oA}&u9?e>ZYbr%J;T_l)q$YI`Gv1|@tj*3eNB!RpuE|qrm2Q7X@6951J

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 4ca21d3eaf3..8f5c422ecfa 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,11 +41,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2